Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 22:11:22 +0000 (22:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 22:11:22 +0000 (22:11 +0000)

Trivial merge